From 44dc960da179f0bdff3716cf88acdf397c1b9cfb Mon Sep 17 00:00:00 2001
From: Kunal Mehta <legoktm@member.fsf.org>
Date: Fri, 29 Sep 2017 17:24:37 -0700
Subject: [PATCH] Sanitizer: hard deprecate passing $options to
 escapeIdReferenceList()

Change-Id: I22743102e75614bba848e09f032586923cef0f60
---
 includes/Sanitizer.php                   | 7 +++++--
 tests/phpunit/includes/SanitizerTest.php | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index a7f963a435..4c996771e8 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -824,7 +824,7 @@ class Sanitizer {
 				|| $attribute === 'aria-labelledby'
 				|| $attribute === 'aria-owns'
 			) {
-				$value = self::escapeIdReferenceList( $value, 'noninitial' );
+				$value = self::escapeIdReferenceList( $value );
 			}
 
 			// RDFa and microdata properties allow URLs, URIs and/or CURIs.
@@ -1344,7 +1344,7 @@ class Sanitizer {
 	 * Given a string containing a space delimited list of ids, escape each id
 	 * to match ids escaped by the escapeId() function.
 	 *
-	 * @todo wfDeprecated() uses of $options in 1.31, remove completely in 1.32
+	 * @todo remove $options completely in 1.32
 	 *
 	 * @since 1.27
 	 *
@@ -1353,6 +1353,9 @@ class Sanitizer {
 	 * @return string
 	 */
 	static function escapeIdReferenceList( $referenceString, $options = [] ) {
+		if ( $options ) {
+			wfDeprecated( __METHOD__ . ' with $options', '1.31' );
+		}
 		# Explode the space delimited list string into an array of tokens
 		$references = preg_split( '/\s+/', "{$referenceString}", -1, PREG_SPLIT_NO_EMPTY );
 
diff --git a/tests/phpunit/includes/SanitizerTest.php b/tests/phpunit/includes/SanitizerTest.php
index 7256694f1b..6fc25df070 100644
--- a/tests/phpunit/includes/SanitizerTest.php
+++ b/tests/phpunit/includes/SanitizerTest.php
@@ -388,7 +388,7 @@ class SanitizerTest extends MediaWikiTestCase {
 	 */
 	public function testEscapeIdReferenceList( $referenceList, $id1, $id2 ) {
 		$this->assertEquals(
-			Sanitizer::escapeIdReferenceList( $referenceList, 'noninitial' ),
+			Sanitizer::escapeIdReferenceList( $referenceList ),
 			Sanitizer::escapeIdForAttribute( $id1 )
 				. ' '
 				. Sanitizer::escapeIdForAttribute( $id2 )
-- 
2.20.1